From 370c459ec50d1de09e8dd9aa2194b4a2d88ada8b Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Sat, 28 Oct 2006 12:14:47 +0100 Subject: [PATCH] Implement new VTPM model. Signed-off-by: Ewan Mellor --- tools/python/xen/xend/XendAPI.py | 10 ++++++---- tools/python/xen/xend/XendDomainInfo.py | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py index 1573be3b58..bed2c9ecf8 100644 --- a/tools/python/xen/xend/XendAPI.py +++ b/tools/python/xen/xend/XendAPI.py @@ -514,8 +514,7 @@ class XendAPI: 'VCPUs_can_use', 'VIFs', 'VBDs', - 'TPM_instance', - 'TPM_backend', + 'VTPMs', 'PCI_bus', 'tools_version', ] @@ -642,6 +641,10 @@ class XendAPI: dom = XendDomain.instance().get_vm_by_uuid(vm_ref) return xen_api_success(dom.get_vbds()) + def vm_get_vtpms(self, session, vm_ref): + dom = XendDomain.instance().get_vm_by_uuid(vm_ref) + return xen_api_success(dom.get_vtpms()) + def vm_get_tpm_instance(self, session, vm_ref): dom = XendDomain.instance().get_vm_by_uuid(vm_ref) return xen_api_todo() # unsupported by xc @@ -929,8 +932,7 @@ class XendAPI: 'actions_after_crash': xeninfo.get_on_crash(), 'vifs': xeninfo.get_vifs(), 'vbds': xeninfo.get_vbds(), - 'tpm_instance': xeninfo.get_tpm_instance(), - 'tpm_backend': xeninfo.get_tpm_backend(), + 'vtpms': xeninfo.get_vtpms(), 'bios_boot': xeninfo.get_bios_boot(), 'platform_std_vga': xeninfo.get_platform_std_vga(), 'platform_serial': xeninfo.get_platform_serial(), diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 8f677ae30b..721edad303 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -1837,6 +1837,9 @@ class XendDomainInfo: def get_vbds(self): return self.info.get('vbd_refs', []) + def get_vtpms(self): + return self.info.get('vtpm_refs', []) + def create_vbd(self, xenapi_vbd): """Create a VBD device from the passed struct in Xen API format. -- 2.30.2